Merge changes from topic "vts_fuzz_cp"
am: 74f5bc1e0d

Change-Id: Id6c82fad78301e69d9aafaa377634ae5ea976593