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

Change-Id: Ia66dd2a90e074d2fcb0dbaeb424031a41752dd03