Fix build errors and revert bb568c079b307740cc516528d783934419a99349

Bug: 122040733
Bug: 121280692

Change-Id: I8e124bd45e52334beef0c368b1a5a81c6a2442e8
5 files changed