Merge "Update-ability: Safely remove clearFlag per Lorenzo and Jean's advice"
am: 7788bf9bc7

Change-Id: Ife2e51e3fd382be5b78724bbb301d9d435df1460