am ae30e930: am bdbc1189: Merge "Add additional const"

* commit 'ae30e9305011d281188cb18a654e96692642c186':
  Add additional const