Merge from eclair

Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29