Merge "Rerun of update-api with no changes" am: f0aa998233
am: 9c0412b7ca

Change-Id: Icb3cd23aed57e3d0c2191f65d9d2298c5b4df006