Merging from ub-launcher3-rvc-dev @ build 6511067 am: 41dc164d11

Change-Id: I6045b70bfff3b0200ad6b0bd43ed908a887de0de