Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"