Advice from API council Test: make; Bug: 139308734 Change-Id: I106dd9f488df79659bb2c63ac8498121c5f4c17c