Merge "Target current SDK."
am: f3bbb3b1bc

Change-Id: I2ebd6d39fa60e4d1ea5d4507b08c8f924c0be055