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

Change-Id: Ifd04d3076a1bd1564c58f525275b6f4e51e2abdc