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