Merge "Merge "reset app preferences" into oreo-cts-dev am: ffd3cae3f5"