intelliactive: Update from faux123

Change-Id: Ifcab9721585a891902595b23543da4c81105b327