Applying the Helium.1 release patch

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