Merge "Update attention config" into qt-r1-dev
am: c2dc9d31ab

Change-Id: Iaeaabe26f621ea138287ed3642defa5d8dbac708