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

Change-Id: I5ad61204c45191fb60819bae717d5a3b6cc7947c