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

Change-Id: Ie2f40eef47acd830247a3ed6f1a8d2e717520e4e