Bug: 27331465 (cherry-picked from commit 0652d1c0) Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b