Merge "Using logger to throw exception Issue-ID: AAF-1032 Change-Id: Ic7a6f89de457bca7c3bdc4ea5a3e58cfe214e06c Signed-off-by: Rachitha <racrama1@in.ibm.com>"