Merge "Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev am: 7659acc0" into nyc-dev