Bug: 27516906 (cherry picked from commit c19c1c2e) Change-Id: I7d2b1091c3523805ef0f87df42feed1098678aad