am bffab5cd: am 63cbe37d: Merge "Fix for P R O G U A R D Issues" into gingerbread

* commit 'bffab5cd06317a0b01faebd1e6b548a83670d44f':
  Fix for P R O G U A R D Issues