intelliactive: Update from faux123

Change-Id: I3ca0d4e9f605895022027a78d15964f5a769bbf2