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

Change-Id: I37f7e13d7974b32cb5487c78f492a6518ef9d4dc