Merge "DO NOT MERGE Revert Privacy Indicators to P" into qt-r1-dev
am: e8c61a23f8

Change-Id: I0875e93ddc5e373d96ad3885e2c2a271bfc599a7