[automerger skipped] DO NOT MERGE: Move wipe cache|data to libinstall am: 388d253b9c -s ours
am: fde9a21127 -s ours
am skip reason: subject contains skip directive

Change-Id: I75e4d17a119f2dc9927b1dac945880e42248663b