Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801eafb am: 6df10a64d2
am: 2b63a6210b

Change-Id: Ic09d027f74d0eb5232dd1f6e1af34b41c5da91fd