am d172e30a: Reconcile with jb-release nakasi-factoryrom-release

* commit 'd172e30aede4cc0b6751b3015ea6c8c036568aa0':
  JRN47D
  JRN48
  JFN47C take 3
  JFN47C
  JFN47C take 2
  JFN47C
  JFN48
  JRN47C
  JRN47B
  JRN47
  force version reset
  JRN47
  JRN46D
  JRN46C
  JRN46B