Merge "Fix ota test case" am: a36f7c1f93 am: 98c17d457e

Change-Id: If081fb3d5355f16ab078e2d993480a8dabd64b55