Merge "Do not use hidden HandlerExecutor"
am: 166c8761a4

Change-Id: I6a82684f3d12e01fb8aa7501a229348fc33ef4ea