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

Change-Id: Ie2c7335cf63eaf07ef35808eddbc26a40aa9bd6d