[automerger skipped] Merge "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"
am: c3382935d9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfd0b52e92675df74a784741cfd578cca163f9bd