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

Change-Id: I1d51b65dd90c80f789fe31ab52fcd18a7152b7ac