Merge QP1A.190228.005

Change-Id: I935322bf6d2cdb13d77b01bf91e5270dac412060