Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 am: f474056e99 am: f4c56a21a3
am: b05f242bc8

* commit 'b05f242bc809196a58b1142665a336fc23dc7f9c':
  Pulling in https://android-review.googlesource.com/#/c/186482/1