Merge "DO NOT MERGE Revert "DO NOT MERGE Remove Privacy Indicators"" into qt-r1-dev
am: 005993172f

Change-Id: Ic817a1b194ec8a73f7d79b187a63cb9dab7f08a5