Merge QP1A.190324.001

Change-Id: I35d442de5cde758c46374bd43b5d408789c2a17d