am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a...
am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit '2e741556':
DO NOT MERGE Backport of I1f55df8a from master.