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

Change-Id: Ic29be466c92a60b95976df0aed63a4055c49859e