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

Change-Id: I52d31aacb39bab11add0bd1c9e71704d25b5a8bb