Bug: 8410085 Merge from internal master. (cherry-picked from cb491bc6) Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f