Merge "Move the intent to SMS namespace for database corruption detection" into pi-dev