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

Change-Id: I4939f105dbc55b1a486d1ecb3a435e651279b2c2