Merge "Rename restartOnConfigChanges to recreateOnConfigChanges." into oc-dev
am: a5e8bfe999

Change-Id: I4921365f720b18d3488da06cbe94a536e6489478