Merge QPR1.180718.001

Change-Id: I27b10dd83b4c1022750c47a234dd9a390efb8096