Merge "Remove reflection for a couple of methods" into ub-launcher3-dorval
am: 46b3a13528

Change-Id: I193c67e00b8c6fe88602a90e066252c69cc79e42