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

Change-Id: Ie9fd418ec09c720cb6fadadf77660c8fec379d28