Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41 am: 3cc9e2dcc1 am: 33d5253e1d am: 62f74e265d

Change-Id: Iedb9659268f3f252d611722375e9e24b8289b91f