Merge "Patrially revert 4ec026930bfbbb5d8923f359c8." into nyc-dev
am: 9bfc33f8ae

* commit '9bfc33f8aeea4d958fa2315cd8b6e6234464c8ab':
  Patrially revert 4ec026930bfbbb5d8923f359c8.

Change-Id: Ieb05a88326f0e6f11a74f1d82e11391a5af9c962