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

Change-Id: I7ca316fba9807cfed786216ba0f150967428266b