Merge cherrypicks of [6075228, 6075392] into oc-m8-release

Change-Id: I68d0ebaacac26eb4035bcfe75bd77ebac0917eb8