Bug: 27538761 Bug: 27809626 (cherry picked from commit 42b61826) Change-Id: Iaa4346295451147af549abb71655caae381cd867