Fixed the failed test cases

Bug: 27621461
Change-Id: I9714d0bb69390a5ff9593297aed5e3e209acb1b2
7 files changed