Merge QP1A.190530.001

Change-Id: I54168da66f768f5ac696defe0558c6300e98740e