Bug: 191763370
Test: Client code (in progress) builds.
Change-Id: Id5a9a95f91b740c61bc5671cc34bd66799db224e