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

Change-Id: I43909dca93d2ffefee157786b6dcf63ef937dc46