resolve merge conflicts of 25a0b43 to nyc-mr1-dev
Pavel Zhamaitsiak [Mon, 2 May 2016 23:11:03 +0000 (16:11 -0700)]
Change-Id: I2ec8738805a34c3d8513f8baa7a6d896403bcf5a


Trivial merge