AJCORE-1300: Resolved issues found using static analysis tool

Fixed warning about possible dereference of an iterator that could
point to the end of the container.

Change-Id: Iec3afdab692b09a14e170fde92b538a69b7462a9
Signed-off-by: Steve Kinneberg <stevek@qce.qualcomm.com>
Merge "AJCORE-1300: Resolved issues found using static analysis tool" into RB14.12