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

Change-Id: Icc7455e4951dcea3b0217680b931789db7859fc3