Merge QP1A.190228.005

Change-Id: I340457054f7e1adacdb9767730ce023e65013657