Merge QP1A.190418.001

Change-Id: Ib86b729fde0e557aee0abe1a1ab2cef0d0631c33