Merge "Switch use of Assert outside of tests to Preconditions"
am: 8f94b81c67

Change-Id: I4ca09bc51ef27005cc6c55195c8625f6e20d2f0d