next batch of changes

Change-Id: I8861ace387f739ba07382b58462ec631ea0ba7c8