Merge "Stop executing if skip occurs."
am: 7c852064bb

Change-Id: Ida6b9d6211619203fc8c9a3f79a88d18e033e74a