Applying the Helium.1 release patch

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