Merge "Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245 am: d9aa87ecee" into pie-gsi