rev 13280 : imported patch 8184346-cleanup-g1cmbitmap rev 13281 : imported patch 8184346-rkennke-review