Test: m update-api Bug: 133438104 Change-Id: I5d10acdd79d1460736eaface8f6fc5b5014a1560 (cherry picked from commit a7e4ca6a)