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

Change-Id: I11db980ed94153e8789a86df7a5e7675211a9f96