[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a54deb34ff am: d051af7e55 -s ours
am skip reason: subject contains skip directive

Change-Id: If81bea222dd9854bfcb67119e50e18799d426930