Update shiba SVN to 17 Bug: 313696499 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6b35acb3152717c80a647f11b09f044ea78a479c) Merged-In: Ib04e3bfe0ecb5580b8294c80a1e011b130b25230 Change-Id: Ib04e3bfe0ecb5580b8294c80a1e011b130b25230