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

* commit 'a01f04a4ec756715d3fa8ecf7c51c2d6c9a71de2':

Change-Id: I3e2d30d249767e0e6329b57ac057215733619d7d