am 4d513f54: Reconcile with jb-release nakasi-factoryrom-release

* commit '4d513f547c5046546ee440485fd5f4ec484f84e0':