Merge cherrypicks of [5142118] into oc-m7-release

Change-Id: Ida047fe37543c6cedb5bd8fcea026f05afea46b5