Merge upstream into AOSP am: b3b9a496c8

Change-Id: Ic103c276716a4cbcde8bf4557d482147bf9ec8a0