Merge "Fake data to be 0B after clearing." into oc-dev
am: cba520fc9d

Change-Id: Ica285a037ead3cd869e3905489eb6abeb95c5194