Merge QPR1.180718.001

Change-Id: I093f6bb00e60d5f5c610700ab1837e46041a7429