Merge "Removing some reflection code" into ub-launcher3-calgary-polish
am: 3cc2d8b3dd

Change-Id: Iaa5006ef94524cf6e1e0ec71b1d3afdbea021509