Commits
Vladislav Kaznacheev authored 4a13b870929
Revert "Fix broken build" This reverts commit 88d753291c834c41ad6c9229082146be72cf8014. Revert required because the base class change has been reverted in http://ag/816441 Change-Id: Iee8a8272bda0a92aed8ae46af8439910d8f1ecdc