Applying the Helium.1 release patch

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