Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1