Merge "Update icon for security settings." into pi-dev am: 3e3b496738
am: 59c8620745

Change-Id: I44c9c526b1e77107bd69ace16ecd9779ab25b73f