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

Change-Id: I26d0c400fd2de7ecadc84d570b1055ca7de5110d