Merge cherrypicks of [
12820899,
12820921,
12820267,
12820924,
12820699,
12820781,
12821235,
12821236,
12820925,
12821237,
12820545,
12821039,
12820926,
12820927,
12820928,
12820929,
12820930,
12820590,
12820471,
12820591,
12820592,
12820593,
12820594,
12821255,
12821256,
12821257,
12820998,
12820932,
12821258,
12820546,
12820933,
12820934,
12820547,
12820548,
12821275,
12821238,
12821239,
12821240,
12821241,
12821199,
12821276,
12821277,
12821278,
12821279,
12821280] into rvc-qpr1-release
Change-Id: I0ae5e959759bf2738be75612c08acef561e6d38a