Merge cherrypicks of [5141855] into oc-m8-release

Change-Id: I6cad0b3abf3d6310ad835765629eaa5fc57d2e2f