Merge changes I57c34813,I96b56fde into pi-dev

* changes:
  Import Jetifier from build 4688943
  Have update_current keep the OWNERS file when updating jetifier-standalone