Merge AOSP master into stage-aosp-master. am: bbc39cef63 am: be2afc022f
am: 1d5ebe8e40

Change-Id: Iba583aff05fdc7574dbd27baf4c3db179611d3c9