Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair

Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9
1 file changed