am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-factoryrom-release

* commit '3dc96b3e5f59a539fdd1910478c409f53a1fe42f':