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

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