Applying the Helium.1 release patch

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