Merge QP1A.190228.005

Change-Id: I78ade61cc1232714239dfa8ce5ee3d0eaf4eea9d