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

Change-Id: I941740a0aab67ab07131291401ca145e9522c847