Merge "bug:3396894  (HC branch) remove STOPSHIP code" into honeycomb