Merge cherrypicks of [7293853, 7292376, 7293922] into oc-m8-release

Change-Id: Idcedfcefb63c6a909de08d4ca448ad5405968bee