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

Change-Id: I0e95d356854ff8a10325c02f51b231204b44d025