am b1b162a8: am 8781d0d9: am a1eb3bfe: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93  -s ours

* commit 'b1b162a843872ad70efc13091430bd6c0a08d470':