Merge "Bump SDK version to 17 to match dependencies." am: d1b7453eea am: b548607eb7
am: ebebeca22a

Change-Id: I2d9e1abfaf4f54a0d0e7f3a1df04bca8f1f46cf1