Merge "Merge "DO NOT MERGE Add EffectBundleTest" into oreo-cts-dev am: 1a6ef8781b  -s ours"