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

Change-Id: If9cbd6310b9c7ba075be62da0ab32aef4ca93e8c