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

Change-Id: Ic6c7a96df4013ddd6b3844ba8cb9fc99ff7a483c