Merge changes I01790ce5,I938e23af into ub-launcher3-rvc-dev am: 047a54a21f

Change-Id: Idbcfa7ade2eb8160be2b99d47bb20be870d48fda