Merge "Updated bp file for ISap 1.1"
am: 9189daec50

Change-Id: Ic721ae95893bfac79f99fb522e2d12455f0a3661