Change-Id: I643a825a3ff878cb8573e96cb2741c0dee0cb29f Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>