Merge stage-dr1-aosp-master into stage-aosp-master am: dcf7f074d8
am: 65b522f566

Change-Id: I9c7a481175edcadce007ffcfadabb15357b5dd39