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