Update to meet Google CTS requirement