Make Injector implementations more readable

Fixes: 333813332
Bug: 335706962
Flag: NA
Test: picker launches without error
Change-Id: Ibd483be43c2d3676e86a1a0fda0bd36495deaca4
2 files changed