Merge branch 'ub-launcher3-master' into launcher3merge2018-10-03

Test: will rely on presubmit
Bug: 116879058
Change-Id: Ifa5b85f0ce5099525d05feee265c7eb54823f560