Revert "Revert "Double commit to stable/helium""

Undo Helium SR1 revert of commit d1849b2fa3328a52a41b3f57b275cb674cd92b00.

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