am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at  9cd60fe.

* commit '247aef7564be66179a988e74bd695c324e36f6dd':