Merge Android U (ab/10368041) Bug: 291102124 Merged-In: I85225e94672841ef4820464410517dfa35492533 Change-Id: I3b25c8cfd69cc838a8afa110649bce6904df7182