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

Change-Id: I26396263ffba3eb1d9c23ad2bcb8f9409a66c571