Merge "Forget metadata scanned from stale volumes." into qt-dev
am: c65f831c54

Change-Id: Ibb353f4f369ab2b8a7fe8d20e5ef3cb5488f8a94