Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 838538ace5

Change-Id: Ifba7316b1056c0932238c9a8ad4a42534c8ed7ac