918ba0c9f2
This should ignore any value previously stored for the old flag. Fix: 235440407 Test: Manual Change-Id: Ib0b21442443575e88153f5a13ea945bfad3fa9f0