Merge "MASTER_CLEAR action should not be public" into oc-dev am: baf1d7036e
am: 6c608ebafb

Change-Id: I76776f7f44a855bde12d6967ef4778523ae89f7a