Merging from ub-launcher3-rvc-dev @ build 6418896 am: df280add9e am: adee7b2e87 am: c33084d36e am: c34c83d6cd

Change-Id: Idf9ac0e929847a081aecd493649ef5d01a64b3d9