[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560 am: 52d940cabb -s ours
am skip reason: subject contains skip directive

Change-Id: Ic76aa44fddbd99fe894d7c78acc177041a64e5f7