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

Change-Id: I9cf66fede65691dd6aba3a3fed116611777540f2