Merge "Fix Issue 26574: Service's onStartCommand receiving incorrect flag..." into jb-dev