Merge "Add logging constant to track settings slice changes" into pi-dev am: 7793bcd867
am: 9e2d483939

Change-Id: I03bb6418c6d6334340b2918dd4b16658650c3fc2