Fix test failures

Authored by Paladox on Jan 20 2017, 4:36 PM.

Description

Fix test failures

Bug: T155831
Change-Id: Ifa62dc12e9047a135e8506d3c6cf1e7ca1dabe0c

Details