Merge "Bump oat version." am: 1882c2295f am: 1c0b5dd2d8
am: e254f6b7e6

Change-Id: I875cdc60176af386c04f8c32b5b655011142df57