optimize derivation parsing (cherry picked from commit 3511430902) Change-Id: I00f76dcd464a5811944613731501af504b6e8c29
3511430902
I00f76dcd464a5811944613731501af504b6e8c29