Merge QP1A.190228.005

Change-Id: I2073b7cb626002751f1ae9788e6c080fe425c4d0