Merge "Using logger to throw exception Issue-ID: AAF-1032 Change-Id: Ic7a6f89de457bca...