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

* commit 'a01f04a4ec756715d3fa8ecf7c51c2d6c9a71de2':
  Patrially revert 4ec026930bfbbb5d8923f359c8.

Change-Id: Ibd1845b62bd4605114b8a0aea27f63f66d30199c