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

Change-Id: I3d9598547e91d3999bd3c6f8d269f52b06b4ebe0