Applying the Helium.1 release patch

Change-Id: I6a3bd5cbbb2fb99637a1fb05bf4eac07845fec6f
Signed-off-by: Colin Dixon <colin@colindixon.com>