Changed based on comments in patch set 2.
Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce
Former-commit-id: ff09ee32ab [formerly ff09ee32ab [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]
Former-commit-id: 470abe2495
Former-commit-id: 58e3bbbe97