Merge "combine wait for exec log with service exit log"
am: 483d2f9a59

Change-Id: I58622d8a76f6f9ecc5df5bb421a4c6af6b72b41a