Merge "Separate updateAad from update & other cleanups"