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

Change-Id: I667d0a7aaca2dd2f62938aa311ca291bbe4e45e7