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

Change-Id: I9c49b78fe8ac16bf56c88cd373e8ff51f9581e59