Merge stage-dr1-aosp-master into stage-aosp-master am: 941185b84f
am: 12cb7c8ade

Change-Id: Ie1b8c0ef016a004ad9c6cdadc27db63ae3f4b80e