Merge "Disable 1934 on stream and trace configurations."
am: 001aef6f51

Change-Id: I33a91dcaa4959e41c516561e6a6f031b482948f7