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

Change-Id: Id1e6dc726f6d23240d37847829f8d952a4e43312