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

Change-Id: I9b6a559f4295dd25e84d17e89d93ee0cb3c3a7f2