Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
am: 3ad6233685

Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a