Merge "Remove ptp from persist config on boot" into oc-dev
am: 1d1cf13056

Change-Id: I6c9afcc05fa88bbbbe63ddd3ab948e887c350505