Bug #900932

Change-Id: I4b3f6e18fb0ab68a8d9e0e5327d672e373f9a291
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>