Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev am: 7eaec196b7
am: cf03183241

Change-Id: Iea8951ca4ddc1b69ca57da6b9cbaf1bcdd860bcc