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

Original change: undetermined

Change-Id: Icc0aca969fc422236db6e0ce267067ff11221d4e