Merge cherrypicks of [719644] into oreo-mr1-cts-release

Change-Id: I04a82417201d0d17f319cc84d24df9af9ab03d91