Merge QP1A.190228.005

Change-Id: Ie3969717075cf9673867bea669bc1be4f1cc1c8d