resolve merge conflicts of 25a0b43 to nyc-mr1-dev
Pavel Zhamaitsiak [Mon, 2 May 2016 23:24:03 +0000 (23:24 +0000)]
am: 06903de696

* commit '06903de6961de032beb3cd5d0a32983ca21f1cca':

Change-Id: Ide5320f789c3f1b92e11b5de7a7c5c271bce05ad


Trivial merge