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

Change-Id: I349a578cb15bce8b89f1bc92b74886aa0b6aeaad