Merge branch 'stable/essex' into stable/folsom

Change-Id: I1e31954da5cedd053418e9a518d09bf3937151b6