Fixing some tests for Phone form-factor.

Bug: 27533946
Change-Id: I70e15dee2ae7c14c1768d56ee04f87d05dd0f926
5 files changed