Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev am: fbe2eedb28
am: d35dcb9092

Change-Id: Ib3f30e3319a7092bc58564d77e0a22ef56709670