Merging from ub-launcher3-rvc-dev @ build 6511067 am: 41dc164d11 am: 3ec5c4970c am: e7f0d0ab9d am: 72139e2d8b

Change-Id: I7cdba25d938f4ef1a6f355f58ab5085ea17b8730