Merge changes I7f7d4e0a,Ie966e37d into nyc-mr1-dev
am: 868c5ca102

Change-Id: I387dcefdbbbd3ac76d568f1c5a2a06be7bcb3bb1