Merge QPR1.180718.001

Change-Id: I3b91b717f7e6740f81911b6f74633abffb958abf