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