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

Change-Id: I1d3ce7e7d198f3256d3ecbd932f8d6f9977ba16d