am ff505df0: am f135d5f3: am 21a012ef: Reconcile with jb-release nakasi-factoryrom-release

* commit 'ff505df024175819857c25f10249cf0abe3d1518':