Yup came back today and my port of entry was Abu dhabi! The officer asked me the purpose of my visit, took me to secondary inspection room and stamped my AP. I enjoyed my flight back to USA as i didn't have to worry about going through long lines at customs. Good luck!!