Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
am: 88936d4a46

Change-Id: I13b6d8579a5e1c00aa8ac23ae1f8deac05c057cb