Merge "DO NOT MERGE cherrypick from master" into ics-mr0