Fixing merge conflict between 2 cherry-picks for wmf15

Change-Id: I92633477d1cb237c4354193c557a8c2ece8873a6