2017-04-25 - releng
06:46	<Amir1>	uncherry-pick f6ce64e99a and 225b8d4e82 (T161563)	[releng]