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

Change-Id: I4b931a3a32a6276fd267324571da9423646b4d9a