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

Change-Id: I0284ce72b9e680c57cf6e9ffc488c094b239da6c