Updates as a result of Excelleris information and BC-User list suggestions

Change-Id: Ia1e65fa8ecb62eb84f92eb7f89a7082211a885ec
Signed-off-by: Anita Kanyange <ak.kanyange@gmail.com>
Updates from  Simon and Jeremy's code review

Change-Id: Ic5ab386346288294bd86272df2ae361723838d2e
Signed-off-by: Anita Kanyange <ak.kanyange@gmail.com>