Merge QP1A.190228.005

Change-Id: I44c725955c3dd3daa6568384ee20bf8761838fbf