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

Change-Id: I04ded5d3ff9d019c0c4ec25044d642e9c111f94b