Merge "Add known failures for new tests that are too fragile" into oc-dev
am: 43f939049f

Change-Id: I782ecf1a0c26370b686f767d11454446f6e901b0