Merge "Removing possible user defined strings from bugreport view-dump" into rvc-dev am: 31c94a2f am: dabe69fe Change-Id: I0b39455ed6d97916da75d467e3b0e10be12cc307