am 54485182: 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 '54485182fc08cbf0965e8c46a309b48eb4d47d90':
  Follow up per Jay's comment on https://googleplex-android-review.git.corp.google.com/#/c/367504/