Merge QP1A.190228.005

Change-Id: Iba721ffe915aa1809d72f1c3b94031a18c8a4862