Merge "Fix CTS test. Bug #3345445" into honeycomb