Merge changes from topic "SetModeNoEntanglement-qt-qpr1-dev" into qt-qpr1-dev am: c1b47d49c7

Change-Id: Ia8bef60a6b4cebde1b427ff34e7fef6d6db1a185