Backport r406643 from branches/1.8

Change-Id: Ie47471ea7a4a672b65e1842a213c857afef2318a
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>