Merge commit '40f87567'

This CL adds git history that is missing in: ag/q/topic:merge_5945220

How was this generated:
$ git merge -s ours 40f87567

More context:
40f87567 is Launcher3 SHA from build 5945220

Test: on top of this git history CL, I executed merge and only two files
had merge conflicts BaseIconFactory and QuicksteLauncher.

Change-Id: Ifd9b738aa681202cff09ccfc18c2a2f8a08acbe3