am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread

* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.