Merge "Grant shell REBOOT permission" am: a656dd889d

Change-Id: I103de65e0ac50151556c69efafaa63911a821acb