Merge "Fix knownfailures for test 152/154" am: 9f2498c21a
am: 64cd4e711c

Change-Id: I24acd3c0f33f19d85fcece36a4eebfa7a21aa70f