Merge QP1A.190122.001

Change-Id: Ie5de99648c0a25cbf755262d4bfdf33c8e125d68