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

Change-Id: I25c20ce92bc77db0e590754ccf050ceb2ebdbe4b