Merge "Replace action button "Uninstall" with "Restart"" am: cedf22960e am: bcafeae6de am: e82a74f15a

Change-Id: I614e92207c5406eb21105088a58dcf9230a13b56