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

Change-Id: Ib38a3804c235bf94d68d57a64c040d256a064d5c