Merge changes I38874b8b,I627ed7c6 into ub-launcher3-rvc-dev am: a29a69943a

Change-Id: I324727deb4c83401e9c1ed13d2c8b0add146ac7e