Merge changes from topic 'exec-start-update-verifier'
am: 8772b3686e

Change-Id: Ifaa071b38d1e34075890fd28adc4a5ccee12de53