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

Change-Id: Ia3f892e87ee0d08607a472db36b788da81987107