Merge "Add tests 988-992 to cts" am: 9a70a63127
am: ea6da43983

Change-Id: I3ced8321ab244066a779bc6b81220108ce950f0a