Merge changes from topic "manual-zygote-snap"
am: 391bc94404

Change-Id: I068bfd198f2a3951fca07d623127c7cb1371b80f