Applying the Helium.1 release patch

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