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

Change-Id: I9f6297f13711236d0ac5d08526d0bb5e90dde9c5