Accidentally submitted into eclair instead of eclair-mr2. I apparently rebased my mr2 working dir to eclair by mistake. Do not merge this so the desired change will survive on mr2 as intended. bug: 2265222
Accidentally submitted into eclair instead of eclair-mr2. I apparently rebased my mr2 working dir to eclair by mistake. Do not merge this so the desired change will survive on mr2 as intended. bug: 2265222