Merge \"Merge \\"Do not remove handlers for loaders.\\" into nyc-mr1-dev am:...
Merge \"Merge \\"Do not remove handlers for loaders.\\" into nyc-mr1-dev am: b6ee468b\" into nyc-mr1-dev-plus-aosp
am: 11343088
Change-Id: I80459fe11f37ad937c5855d296a81b2d002370d2