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

Change-Id: If07b70068a29c818a6f718c1da653085b71a2377