fbe0675e02
Finally got my upstream patch merged, only took like three months. Change-Id: I5d2d0570a170c56881272a08aec8942c689f59aa