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

Change-Id: I80bebcd04c277f6e4b0665fe1253b2309e3bc535