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

Change-Id: Ie806e8d213b6a959bb76b7b29ff8a514d3c3c788