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

Change-Id: Ib66e29981876e7d5f313c9f887ea6eed422063ae