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

Change-Id: Ifb8a0adde2b571f734bd507e2f5ede59cfdd68c5