Merge changes from topic "vts_fuzz_cp" am: 74f5bc1e0d am: cfdd7de171
am: 6cc77967f1

Change-Id: Idd063ce3db801ae410f87ee496aff6e254da4803