Merge changes from topic "dynamic_privacy_fixes" into qt-r1-dev
am: ac7423b6b6

Change-Id: I260faf0a117f243e32264d756ad5c015c79fa9ce