Merge stage-dr1-aosp-master into stage-aosp-master
am: 80f754859d

Change-Id: I24305481d558a8a4c98953179d1294c4e113aa63