also fix the assert jira: no-jira Change-Id: I6becb689ff6a1dd2894d5004da796ece8fb23324 (cherry picked from commit ab588003e3bbd844f83b568106f60ef976fc6530)
also fix the assert jira: no-jira Change-Id: I6becb689ff6a1dd2894d5004da796ece8fb23324 (cherry picked from commit ab588003e3bbd844f83b568106f60ef976fc6530)