Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1