Merge \"Make MasterClear a valid entry fragment.\" into nyc-mr1-dev
am: 44ce9aefbf

Change-Id: I7a1b3604bc05718249c532f142c9de45f0c515f7