Merge QP1A.190107.001

Change-Id: Ic20c8d6e1ebe66569990f1fada639d2ef2cc674e