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

Change-Id: Id21099b45715fa60051774ed96b83d78f30e2497