Merge changes from topic "ActivationType" into qt-dev
am: 266b90d80e

Change-Id: I31fd23360e7d8dc2f31369f2bf6409cd78532b41