Merge "Fix cumulative error in setPositionNotificationPeriod"