Merge "Merge \"Remove subtle dependencies\" into nyc-mr1-dev am: c8daad4290" into nyc-mr1-dev-plus-aosp