Merge "Refactor test 983 to prepare for inclusion in CTS" am: 7fe39afe80 am: 90fe92e6b9
am: 6199e3a0cf

Change-Id: Ic466ffb06b485428870828022ebc183db3a8a967