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

Change-Id: I7b977dc2ac3c516aa808ba0e6b6afd139a9ebd98