Bug: 18909596 (cherry picked from commit 7ab249a1) Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3