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

Change-Id: Ie712474c077a79dcda56acc73ab8bf79548882b6