Applying the Helium.1 release patch.

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