Fix broken unit tests; fix proguard warnings

Bug: 3456565
Change-Id: Ibb3e0c2330a7d051b50ca522b7f102fb9bde0f43
1 file changed