Merge "Bump API to match dependencies." am: 706ab5cdf4 am: af4651e742 am: fa974e1e46
am: 7e1201e44b

Change-Id: I2ad1b191e5e7bec04514e47676f60c236823a462