Bug: 28748264 Change-Id: I4dc366aa710c9ef05aa5d1b164d558232fe57a3d (cherry picked from commit 45968e76)