Merge "Cherry picked from c9a94b0f in master. Do not merge." into ics-mr0