Merge "Bump oat version" am: 596c58b3dc am: 5476d230b5
am: caa7528acb

Change-Id: Ie50289cd1cc310e074e22f7d0145f43aa83ddc95