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

Change-Id: I0fc7059b4cadbf04e3aedd45788a2c4bd42d3195