Merge "Grant shell REBOOT permission" am: a656dd889d am: 1e43248938

Change-Id: I197960b734bb5360e442683d0940d42ee8902305