Bug 1517658 Change-Id: I531a1c95b94910e564e71e1f2dc26754eefa45d5 behatnotneeded: platform-specific bug