am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix...
am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit 'ad5ee2f4':
DO NOT MERGE - Fix improper declaration/use of pointer.