Merge "Simplification of code to prevent a Log.wtf in expected cases." am: f54483b6 am: fbc68b97 am: 9e376b56 Change-Id: I846943dc91ef3cb6dc7516ba38dc93fb8a80bb88