mitaka fixes based on fuel 9

Change-Id: Ie174d80e0adc7d17cf330a756db40449f4ff3adc
1 file changed