Cherry-picking c95b39d3 from eclair-mr2

Change-Id: Ib8aaefdde96422ab7b54e10e0e9328bba10e305f
2 files changed