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

* commit '5c0c8a6b83e0513b2cd83cf934d252d7a641620e':
  Patrially revert 4ec026930bfbbb5d8923f359c8.

Change-Id: I3d5c9ddc5c37f3b51db09c881ba587d07e8a1774