[automerger skipped] DO NOT MERGE Rearrange listener logic so it can be overriden am: 19f5398e51
am: 6034df9e44 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc6a0b27a9ac0fe95c0eeaf4f33f5f85ef9c1383