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

Change-Id: I93ebcdad0f2fae9afe801e0267da3c56c3c53a69