fixed the code for better security

Change-Id: I8e11507276003c8070c172c2c273dc5395d5a1ef
Signed-off-by: skedem <skedem@qce.qualcomm.com>
Merge "fixed the code for better security"