Applying the Helium release patch for aaa

Change-Id: I270bc2d0f8bb025e150a0ddf1154c206001dfa6d
Signed-off-by: Liem Nguyen <liem_m_nguyen@hp.com>