Differentiate system and test apis in whitelist am: 370a06477c
am: 24a29e058b

Change-Id: I7431914a5a2e843ed277c92bd259760fe27357fe