Aaron Wells authored Jul 11, 2016 and Robert Lyon committed Jul 11, 2016

Change-Id: I71818f1bded211ecae5d16d07fef0a433e095cd4
behatnotneeded: Can't test Google embeds in Behat
(cherry picked from commit 0e48b3bd)