Merge QP1A.180823.001

Change-Id: If60000cfa24ab1ead622c4e424b1623ef71ff4b7