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

Change-Id: I55f05db6ab984888e390e6aa1d3fabc830f2b107