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

* commit 'a7ec8fa4d664f6ffdad038acbaa66b4f0915be46':