Merge branch 'ub-launcher3-dorval-polish2' am: ea6d0e631e
am: 2580bd6783

Change-Id: If8816b1381769b9a8e8690647548ceb7a301ccce