Bug: 17890306 (cherry picked from commit b6404fe0) Change-Id: Ie13d6af1d384c6ebf87e8f055120609e2bff3338