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