Merge QP1A.190523.001

Change-Id: I8f8f705979df1a04c8bcf90c3fd2e4d8ecba22ac