Merge changes from topic "SetModeNoEntanglement-qt-qpr1-dev" into qt-qpr1-dev am: c1b47d49 am: ca0b2a22 Change-Id: Ia6998ab1ef8e1830f73cd0ad5c51abd8321577f3