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

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