Merge changes I09bce218,Id5716a34 into ub-launcher3-calgary
am: 06580312ed

Change-Id: I1ed3a1a937bf4d9667e4b154d060819169ffd931