[automerger skipped] [DO NOT MERGE] Prevent hotseat touch hijack am: acf0a5da0b -s ours am: 33dbf83f16 am: 841e8f2adf am: dc6e890616 am: 0b879354d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I019f0c05eedbab846b06f7b28797aed5a1480aff