Merge "Update lib in second place for cl: https://android-review.googlesource.com/#/c/132258/"