Merge "Re-enable test 983 with speed-profile"
am: 113ecfe9e7

Change-Id: Icfd4f04b675079f6f92da825253b02d07ef82e84