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

Change-Id: Id77bc47085b72bbc04a9cee635fe288f3c8f7ef4