Bug 580697update the profile and make it more flexibleChange-Id: Ic60ea91946cef1b1597127c35ee0dd66c3790378