Applying the Helium.1 release patch

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