Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I46443846579ecb49a3af90fc2065ba249840c007