[automerger skipped] [DO NOT MERGE] Prevent hotseat touch hijack am: bfa3be34ce -s ours
am skip reason: subject contains skip directive

Change-Id: I1ea142caab0459b9ba46a5ed843e968de5ebbf21