Merge QP1A.181008.001

Change-Id: I6254e312edc457eeaa43c887d3b55eda12e88011