Applying the Helium.1 release patch

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