Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev