Merge "Const modifiers" am: 4efd353d8f
am: 92d8772c49

Change-Id: I453dbfb45e3f70586e77cb28207c164fe9cb72fa