Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG: 120448245

Change-Id: I65b3aa4e1ad1d95464f0b4cd1af211be4fb1ddbc