Merge "Fix lshal_test after updated defaults."
am: 0ba6a437d5

Change-Id: I8d7c644b37feacfe71ed422bd147b1f3ed149ee9