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

Change-Id: I4eaba924245e1ea9aaec84b4c05ae8cfb03cfc6a