Bug 1424817

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