Merge "Restrict setting silenced in RecordTrack." into pi-dev
am: 70376b1227

Change-Id: I158012e95a1c19b60afef2143514296fa3ab332c