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