Merge QP1A.190228.005

Change-Id: I28aec2f728afb69fce946f41dbdde9734836df76