Identity rewrite for better extension support and testing.
Change-Id: I0acdc3314d48d1ae982bd2ec759d7b1b9699a9bf
Merge "Identity rewrite for better extension support and testing. Change-Id: I0acdc3314d48d1ae982bd2ec759d7b1b9699a9bf"