Applying the Helium.1 release patch

Change-Id: I88b1f69f881ad4dbdcd9e51b1cc33e675a055c78
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>