am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':main
commit
c6e3327f88
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':main