Merge "Fix ota test case" am: a36f7c1f93

Change-Id: I6bc947c43699f53ba9a460b8f144c2ddb9591e29