Merge "Comment updated for privacy clarity" into pi-dev am: bd506eb539
am: 529b714af1

Change-Id: I0c201ab12b86120302db651b16d05e93b9f2b561