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

Change-Id: I3cb318ca275f9b674dcf47340e2997b3f16c9e7d