e681c27dc6
Follow-up to I470261f659a573400b2eb1421eeb953c87e58b66. Bug: 17416492 Change-Id: If0da5f163049540476d84d147c0e733fab1ae6d5