Merge "Revert "Remove attention controller"" into qt-qpr1-dev am: 1876b8c6dd
am: ca51533d56

Change-Id: I7f1e7b3ddc83ce806d826bfd2ff40b89c44bc386