Merge "Test: Functionality of "Reset app preferences"" am: c9564922ed
am: 757f81789d

Change-Id: I6a0b27af46a4fec5f9431397c8fefeb68513d3b3