Commits
Robert Greenwalt authored b097fbbff33
DO NOT MERGE Reverting change I53e91db7. 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