Bug: 28177082 Change-Id: I8f3f2d8ce559e93cba29f8eedd5b95d1389deb23 (cherry picked from commit 33703f0c)