[automerger skipped] [DO NOT MERGE] Prevent hotseat touch hijack am: acf0a5da0b -s ours am: 33dbf83f16 am: 841e8f2adf am: b040757e5b am: 39679d42f5 am: d7247a75fb -s ours
am skip reason: subject contains skip directive

Change-Id: I1e9f248f36afb4f771eb3c4ab9c628e42fcdf24e