Bug 23900149. Change-Id: Iff8a3892bb88f82736e5fa680c38d98cda4d2777 (cherry picked from commit e1641395e30de7b53b06fc5c820ea83bf04b3aad)