ASACORE-1194: Address static analysis issues.

Change-Id: I52ec1f1b16bd0562540e016a50130a6da6c23b24
Signed-off-by: Todd Malsbary <tmalsbar@qce.qualcomm.com>
Merge "ASACORE-1194: Address static analysis issues." into RB14.12