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

Change-Id: If992a629986d1873f3908668dd2c05aeff3f1aa3