The change is a cherry-pick of relevant fixes from the following commits on master branch: the followning commits:9be03c4e98ande05bb956ceChange-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
The change is a cherry-pick of relevant fixes from the following commits on master branch: the followning commits:9be03c4e98ande05bb956ceChange-Id: I87cef323c4eaee4e9f60475f01156b276593fa50