Update shiba SVN to 31 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:98ed4cdd4eb4b4e8deb094478a8a351bea7a6cdc) Merged-In: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b Change-Id: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b