resolved conflicts for merge of 6ac53bee to master

Change-Id: I7a160d224f20e825f060561725b11f5cc7b2c685