Applying the Helium.1 release patch

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