Fix identity v2.0 entry point

Change-Id: Ifae91a612fcd8b66660b93f6ea81d37e0f1bce1d
Merge "Fix identity v2.0 entry point"