Merge "Merge \"Do not remove handlers for loaders.\" into nyc-mr1-dev am: b6ee468b3e" into nyc-mr1-dev-plus-aosp