Merge "Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev am: 171a1c2" into nyc-dev