Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev am: 50ff32c17f
am: 4b62110262

Change-Id: I277aabd654295050509266abc7461a4a2802b5b9