Clean up issues left c/121064

Change-Id: I5daa3c8f75c93dbbd6a8f748a6c869d73d3959f6
Merge "Clean up issues left c/121064"