Merge branch \\\'ub-launcher3-burnaby-nyc\\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 8868238fb2
am: 7cd14d0e55

Change-Id: Ibc4dc53a6993bdd4b6b69b9eb80a5dba12ff6b27