Bug: 28065407 Bug: 27865109 Change-Id: I8cebc22a9e072fd1d6d765427a0cd59ba2201bf6 (cherry picked from commit 0de80b9f)