Use const more places

Change-Id: Ibc068d319d6fff26f2d11248e17481d8f7f027e0
2 files changed