Merge QP1A.181011.003

Change-Id: I33495a35ae59b047826cf39396a0341d1c9b1798