Merge QP1A.180823.001

Change-Id: Icc9071bc661b5c76d372b9eba5dafe2158568f8f