Bug: 18596910 (cherry picked from commit 8a9f0049) Change-Id: Ic06429f41840ce318cfaa837efecc69c2076440e