Merge "Rerun update-api. It was out of sync."
am: 03a9249547

Change-Id: I9c6db2a1e1383d8ff85ad1ae947029c9dbf3eb2e