To match existing API Test: make, cts Fixes: 130224929 Change-Id: I881ce11b583b389ee43bad6b45f837c85f949aa5