Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 am: 880fb0f02d am: 08a824f44d am: 61858606b0
am: 716212604c

* commit '716212604cf986f047c97c381ef9d45063fe031e':