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

Change-Id: Ic48be385dc43c8f3fafbdfdbdd5e3a91678c2604