Backport bless result into stable/essex

Change-Id: Ib5cdf6d7106a08e9a2748bfd9a1256ef20ce81fb