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

Change-Id: I33c7410f1b725f7df24effe4ce0ab8d31e436b95