[automerger] Revert workaround for missing frame callback am: 2ad2859f1e am: 53d57998c1

Change-Id: Ie39ded4d958e25cf732d0fa3988151858186df8d