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

Change-Id: Ic023490a00d08c3f5bccaf75fed3ac7f2a23733c