Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3 am: a8365c8ffc

Original change: undetermined

Change-Id: Ie2193b526dba5fdb66e8e5727fede99f61d908a3