Merge "Add Settings Slice Whitelist key" into pi-dev
am: 1561bb41bd

Change-Id: Ic0843740958ff9e191f98220c3a80bf29a5e8251