Merge "Worked around the random CTS testOtherH264ImageReader & DecodeAccuracyTest failure. am: dfc4b4b2ca am: c931ff2293" into oc-dr1-dev-plus-aosp