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