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

Change-Id: Ib6d5051eea746a1e5e19ab9665f1276bb6cd31ca