Merge "Remove Preconditions usage to stop dependecy with non-updatble class" am: 821089e106 am: cdee1cfe24 am: db6cf82c14

Change-Id: I0349967619b0ef3fa3f5fbec4ffa07688bdc4055