resolve merge conflicts of 0110b7d to nyc-mr1-dev-plus-aosp
Pavel Zhamaitsiak [Mon, 2 May 2016 23:16:41 +0000 (16:16 -0700)]
Change-Id: If476e2183c04353f4848833864909cc2f191ddf7


Trivial merge