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

Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd