Applying the Helium.1 release patch

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