resolved conflicts for merge of fdf64770 to master

Change-Id: I2bbeaf95bf209b1319c346391cd34b4e556d41e3