ami304 4 checkpoint

Change-Id: I4c6669742a0485f962d5fb74e6a375c6c1af834c