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

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