Merge QP1A.190228.005

Change-Id: I8de57e07e25a7d5a463465bf1230ac955b3b025f