Migrate to master part 5

Change-Id: I788fc6f213d9df4771c99e705c8913d1eae22c9b