e803 final

submitted oss to merge on review