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

* commit 'ec3255813d1920dc1fa0be49c004325c8e54420f':
  Follow up per Jay's comment on https://googleplex-android-review.git.corp.google.com/#/c/367504/