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

Change-Id: Ifa74f4d3750c6b6dfc138a49e2cb064a216c99e4