Applying the Helium.1 release patch.

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