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

Change-Id: I10d084110e0ca2880ba744ad14ee3cbf1288190b