Without this patch, there's 2 unit tests failing. Change-Id: I0b1e6585d2ff68a621c82930f9627801ff2766df