Applying the Helium.1 release patch

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