Merge "Remove native code from test 944 for CTS" am: 4a4e245a63
am: 685073b15d

Change-Id: Id2aa39f57f2378a1febce3d0e234a225691793df