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

Change-Id: I4dcb0d7169f2e36158ab94e428aaa868b3bddfef