[automerger skipped] Merge "Do not use hidden HandlerExecutor" am: 166c8761a4 am: 2072de8ff8 am: 3ac69fd2b8 -s ours
am skip reason: Change-Id I998224991cb31d642435a23851aa18da3f00f159 with SHA-1 743c621380 is in history

Change-Id: I97c355417fbacf1fd98c18d728b6dc6d589793ef