Merge "Make a logically const pointer const." am: 3d816e1923 am: 7a23fdd7b5
am: 12fea1b4cb

Change-Id: I75f19e2d3e7351dc264b890a9c6f0e703db2c8ae