Merge \"Change IMT size from 64 to 43\"
am: 30564fd3c9

Change-Id: Ie93335158b40b6924f6b020c2372662f7bf416ff