Fix Issue: 3373525: reduces app. 100mS in create

Updated by removing code duplication

Updated with review comments

Change-Id: I57a596ed09d4d543964059e18a86e143108305ec
1 file changed