Merge "Replace hardcoded value with public API constant" into ics-mr1