am 9aae69c6: Reconcile with nakasi-factoryrom-release

* commit '9aae69c63423b9dc235516c60ee00bf4a322073c':