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

Change-Id: I09a1ec943c30e5e3b7df751ef07e5548574f2c2f