Merge changes from topic "executor_api" into pi-dev am: 8cb2aba54d
am: d0d4291fef

Change-Id: I00bb1fbfbeeee77454f156fd1853380c33be7dab