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

Change-Id: Ic4710704a12bd0bc061d26390199355ed926557c