Merge "Bump API to match dependencies."
am: 706ab5cdf4

Change-Id: I664ecf42e7dc31a91e48d2562fb0d13f201ca8f0