Sync changes with branch under review

Change-Id: I6398cdc80b6e8bf43e4ad023fdfa757395bc4b98