Merge "Fix for TestDirectBootEmulated testcase"