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

Change-Id: Ia35b3f095a626436b989862281c0f13074818752