Merge "Follow up per Jay's comment on https://googleplex-android-review.git.corp.google.com/#/c/367504/" into klp-dev