am d36e8df7: am 84f4adc9: Merge commit \'59dfbb91\' into klp-modular-dev-plus-aosp

* commit 'd36e8df7241f2433233377bbc803468c91ae8ad9':
  Fix build [DO NOT MERGE]