Merge "Simplification of code to prevent a Log.wtf in expected cases." am: f54483b6ef
am: fbc68b975a

Change-Id: I5f5fa22468c8db09e4eeb3d446220b4ebc396d98