Applying the Helium.1 release patch

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