Merge QP1A.190228.005

Change-Id: Ib37cb1ffe6803d1850106275f380d33503d3a2f3