Backport r422241 from trunk

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