Merge QP1A.190228.005

Change-Id: I2033703ced9b95894c58c0e0de9957b976c32729