Merge QP1A.190626.001

Change-Id: I44219e9456d23d93a8016aa234ad3cadbcfcf837