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

Change-Id: I9132c328398d9c213070de47dcc66008d58a3da0