Update XFAIL am: 0aea6aeca4
am: 947fa39a98

Change-Id: Id27aee66b3d78ddc3ef9efe70cb81f71fc70f357