am a5ed815d: Reconcile with jb-release nakasi-factoryrom-release

* commit 'a5ed815d6b5cb31c6b809eadc1b5a91f578c988b':