Merge "Add a new context for property ota.warm_reset"