Merge "Ignore -Wcast-qual warning" am: 363a210ec5 am: cd066dc72f
am: fcefd5f56c

Change-Id: I93f744f90f42574c79c447448f26003089599ca9