Helium stable branch adjustments

Change-Id: Icd21bcd48ee247507bc6bffd19d715c4920c157d
Signed-off-by: Thomas Kee <xsited@yahoo.com>