am 59d16c9e: Merge "make console shell run as GID=shell"

* commit '59d16c9e9171f4367ad3a0516e7000c0d95e89cf':
  make console shell run as GID=shell