Update MaintenanceShell to current master from bogus rev

Change-Id: I760d6f50b4396028fa1d7f2f37374fd843f5e58b
Merge "Update MaintenanceShell to current master from bogus rev"