am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patches

Merge commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7'

* commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7':
  fix bug in applying patches