am b825b8b3: am 170e4e88: (-s ours) am 56b1bf1e: Merge "Purge invalid SIP phone accounts at startup." into mnc-dev

* commit 'b825b8b3e87c48efc2cc2080d7c8001123092a7a':